From 246fb92a55dd3da4f8b558864d3079c5db7a3deb Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Tue, 1 Dec 2015 05:37:35 +0100 Subject: [PATCH] Remove dcmtk-www from the rules --- debian/changelog | 3 +-- debian/rules | 19 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index d50f4638..dd1f9437 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,8 @@ dcmtk (3.6.1~20150924-1) UNRELEASED; urgency=medium * New upstream version - * revert to old build system since cmake introducer too many problems - for depenended packages * move vcs to git + * Remove dcmtk-www, because it is no longer provided by upstream -- Gert Wollny Tue, 01 Dec 2015 02:46:03 +0100 diff --git a/debian/rules b/debian/rules index e67126f1..c7c647b3 100755 --- a/debian/rules +++ b/debian/rules @@ -7,8 +7,6 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed # needed for the tests export DCMDICTPATH=$(CURDIR)/dcmdata/data/dicom.dic - - # deduce documentation option (build-indep target) ifeq "" "$(filter %-doc,$(shell dh_listpackages))" BUILDDOC = OFF @@ -23,7 +21,6 @@ endif %: dh $@ --parallel --buildsystem=cmake -# -DDCMTK_INSTALL_DATDIR:STRING=libdcmtk5 # SKIP_RPATH=OFF to run test suite: # see #701231 @@ -41,7 +38,6 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \ -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk5 \ -DCMAKE_SKIP_RPATH:BOOL=OFF -# -DCMAKE_INSTALL_PREFIX=/usr \ override_dh_auto_configure: dh_auto_configure -- $(CMAKE_EXTRA_FLAGS) @@ -59,22 +55,13 @@ override_dh_auto_build-indep: override_dh_auto_test-indep: -override_dh_auto_test: - echo "DCMDICTDIR=$(DCMDICTPATH)" - dh_auto_test - echo "DCMDICTDIR=$(DCMDICTPATH)" - - override_dh_auto_install-arch: dh_auto_install # ?? mv debian/tmp/usr/etc debian/tmp/ override_dh_auto_install-indep: - #DESTDIR=debian/tmp $(MAKE) -C obj-*/doxygen install DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/doxygen install - #rm debian/dcmtk/usr/share/man/man1/_tmp_buildd* - #rm debian/tmp/usr/share/man/man1/_tmp_buildd* rm debian/tmp/usr/share/man/man1/_*.1 override_dh_installdocs: @@ -84,16 +71,10 @@ override_dh_installdocs: override_dh_install-arch: dh_install # --list-missing - chmod +x debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/* # wotsit ? rm ./debian/dcmtk/usr/bin/*_tests rm ./debian/dcmtk/usr/bin/drttest rm ./debian/dcmtk/usr/bin/mkreport - # fixup - mv ./debian/dcmtk/usr/bin/preplock debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/ - mv ./debian/dcmtk/usr/bin/readoviw debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/ - mv ./debian/dcmtk/usr/bin/readwlst debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/ - mv ./debian/dcmtk/usr/bin/writwlst debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/ override_dh_strip: dh_strip --dbg-package=libdcmtk5-dbg -- 2.30.2